Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

UPP Logistics Worker and Political Commissar Addition #6920

Merged
merged 6 commits into from
Aug 22, 2024

Conversation

Steelpoint
Copy link
Contributor

@Steelpoint Steelpoint commented Aug 11, 2024

About the pull request

This PR adds two new UPP roles for admin events, the UPP Logistics Technician and the UPP Political Commissar.

The duties of the Logistics Technician are self-evident, however the duties of the Political Commissar are ill defined. This is intentional and it is up to a combination of the staff running the event, and the player, how they want to have the Commissar interact with the UPP Command Staff, or USCM forces. They are technically considered a non-combat military personnel, and are not a civilian.

The PR also adds a few bits of organization to the UPP gear preset file.

Explain why it's good for the game

Adds more options for admins in events. The Logistics Worker can assist in managning the UPP supply depot/s whereas the Political Officer can add unique opportunities for roleplay interactions not typically seen.

Testing Photographs and Procedure

Screenshot 2024-08-11 14 56 17

Left, Logistics Worker
Right, Commissar

Changelog

🆑
add: The UPP Logistics Technician has been added as a event role for the UPP. Their intention is to assist in operating any supply depots and logistics departments under the control of the UPP, they also possess engineering and construction skills allowing them to assist in fortification work as required.
add: The UPP Political Commissar has been added as a event role for the UPP. They act to ensure the political ideology of the UPP is upheld within the unit they are attached to. The goals and ranking of this job are left undefined to add ambiguity as to their ability to influence the UPP command structure.
/:cl:

@github-actions github-actions bot added Sprites Remove the soul from the game. Missing Changelog Maintainers always document their changes. labels Aug 11, 2024
@github-actions github-actions bot added Feature Feature coder badge and removed Missing Changelog Maintainers always document their changes. labels Aug 11, 2024
Copy link
Contributor

@Blundir Blundir left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sprites look good

@Blundir Blundir added the Sprites Approved confirmed no stray pixels label Aug 11, 2024
@Steelpoint
Copy link
Contributor Author

I've re-named these roles into a more literal translation.

@cm13-github cm13-github added the Merge Conflict PR can't be merged because it touched too much code label Aug 21, 2024
@cm13-github
Copy link
Contributor

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@cm13-github
Copy link
Contributor

Conflicts have been resolved. A maintainer will review the pull request shortly.

@cm13-github cm13-github removed the Merge Conflict PR can't be merged because it touched too much code label Aug 21, 2024
@harryob harryob added this pull request to the merge queue Aug 22, 2024
Merged via the queue into cmss13-devs:master with commit d25df94 Aug 22, 2024
27 checks passed
cm13-github added a commit that referenced this pull request Aug 22, 2024
@Steelpoint Steelpoint deleted the uppfluff branch August 22, 2024 16:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Feature Feature coder badge Sprites Approved confirmed no stray pixels Sprites Remove the soul from the game.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants